(diff): Really do use arg SWITCHES.

diff --git a/lisp/diff.el b/lisp/diff.el
index 0c474672b7016d56399d772f208e66c46f1ada30..d4c5f5d3a2e53150876d3f77b8ec8da251185313 100644 (file)
--- a/lisp/diff.el
+++ b/lisp/diff.el
@@ -196,9 +196,14 @@ With prefix arg, prompt for diff switches."
        (let ((command
               (mapconcat 'identity
                          (append '("diff")
-                                 (if (consp diff-switches)
-                                     diff-switches
-                                   (list diff-switches))
+                                 ;; Use explicitly specified switches
+                                 (if switches
+                                     (if (consp switches)
+                                         switches (list switches))
+                                   ;; If not specified, use default.
+                                   (if (consp diff-switches)
+                                       diff-switches
+                                     (list diff-switches)))
                                  (if (or old-alt new-alt)
                                      (list "-L" old "-L" new))
                                  (list (or old-alt old))